Chaged a bit of entity targeting