Merged changes to home pc

Merged changes to home pc