Changed CreditTargetController to use core logic