Targeting update

Trying to imrpove targeting code.