Changes as per Colins comments