phoebes changes

Please check out these changes and approve merge to master