Last modifications before finished