update to cexp 2.2 src