got rid of stuff, added stuff