Changes suggested by @jabley & @mattsheret