suggestions from @marcopolo