Improve speed a bit