Added suggestions from Jonathan Lennox and Alexandre Petrescu