tweaking for 6.0
updating windwalker monk for 6.0
merging again?