updated with some changed flows