updating final changes