rm analysis, merge with the analyze tools in the water template