Home controller
fix merge