Added some things that are not essential!!