updated homecontroller
merge