Close to final modifications