added compatibility changes