Tweaked/Tested CXR macro