added recent home changes
resolved merge conflicts