steffi's updates, working flow control