Home setup

Merging changes for home setup to next version syco