non-LL refactoring still ongoing