small changes.. probably no difference -- tests in loops now