added suggestions from @espertus