Incorporated Roman's feedback.