Made things faster...