added all flows, fixed highlighting