SLR0 unfinished changes