add waterbeam and clean up