Committing last changes before hd replacement || Errors included :(