buffer swap working; issues with water flow