Speed up, removed some verbose options temporarily