small changes. increased backwards compatibilty