checked in rest of changes