added some UMS compliance hacks