Working on putting left-factorization back