Added some stuff, please ignore the file ending with '~'