add @adamrp suggestions