Make it faster...