implementing suggestions from hatoum