changes to increase compatibility