fixed 1st by review suggestions