New version; Fallback method, compact flow.