[Suggestion] Revamping the water mill