Some speed upp tweaking