laptop commit
merged version