added stuff, merged alex's manually