Updated for compass 1.0