added remainder of changes