Commit from basic implementation