upgrade to new homeshick function