making some changes before testing