merging with laptop changes
Lots of changes