move to phoenix master version
make changes to work with phoenix master