Added some checks for 1.16
Epic new target finder