Updated for joe v1.2