Better integration for preheat and related modes