Planning and water toolkit v3.4