changes after further testing