finalised changes