removed a bunch of junk and added place