A few changes, still working well