Adding final modifications