Crius update

Crius update
Crius update

With small patch