further changes to ensure compatability