Speed Up a bit