Improved target evaluation