It seems like on certain machines there is a lag when adding keypoints. It would be great to 1. Profile the current implementation 2. Remove potential bottlenecks