added wai and moe