refactoring
working on provider data
EP now working