Merging new changes to home pc

Merging new changes to home pc