Added Conor's suggestion