implements changes from comments