Added some more
Removed temp files