Pulling in some suggestions from @arcimboldo