Taking on board feedback from @leggetter