minor changes, still slow