Updated for CX
Release 0.0.8