Improved code flow.