Removed logging adn improved timing