final version-2