upgraded to work with the latest apx 0.4.0-rc1