Aqueducts: update for drawing logic (#169)