Updated to enable pointing and angle targets