Little changes... still working.