Updated to work with newer cyborg code.