Changes as per Chris' comments