added diverter and day/night flow control