Updated target checking