laptop edits
merged
NF: laptop commit