updates for 0.97