Made final changes

Made final changes