next api

Cam's changes