Tinkering after speed issue