adding sugestions by @adamrp and @wasade