cce22d66b421 overhaul: new approach with better register usage