Changed for universal compatability.