make changes to work with phoenix master