Updating pointerenter/pointerleave based on feedback from @lsmith