Revert to 0.16

Reverting to working version