making changes as per paul reco