works, no regression. next optimize