Last commit from old method