made some changes after testing