first commit from original code