Made things faster. Maybe added a memory leak.