From Laptop commit