Improved general flow.