Refactored a bit so that auto-tuning is optional and not forced