deleted stuff, and updated some code maybe?