Latest changes in adding markers and using keypoints.