workin on 1.6 compatability