Last changes before the reboot and the start of the ultimate night-testing
;D