Finalised changes