added some things, removed some other things