Made final modifications