more refactoring. focusing on changeAlls