Fianl changes