Making it alot faster