commit from Gon old VAIO