SetTarget improved