Made final changes