Moved whitelist check around, added good credit place holder