added a few things removed others