update to use new bacon2d