Switch to supporting the boxcar2 api
Slight syntax tweak