final changes before testing