Added target tracking