cleaned up for zero1, water only