target logic + minor changes