Updated Homes and code related

Update