Updated model and home controller