Final changes

Adding final changes