Slight modifications to pass msftidy