cleaned up WOAE