Last modifications before Beta