some changes after testing