deleting things
restructuring again