added stuff from this branch