Rework homeshick logic