0.90 compatability update