Refactored Credits