Switched to refactored model of calculating interest