implementing @adamrp suggestions