Last changes before New Dev update