removed custom subscription hooks in favor of onWait