updated to support msec hacks