Updated for compiling CM 11 for W5