Weatherwax support

Please review my changes