fixed 2rd by review suggestions