Suggestion on making the OW better ?