Some changes to Home Controller