Credit fix

ALL TEMPLATES FROM Credit fix