credentials moved around bit for better access
fixed conflict