replace bootstrap implementation with new flow control API