got rid of copy paste hacks