Final changes to this phase of the Homepwner