refactor and home changed