laptop changes
merged laptop changes