Few changes in Home Controller