Diagnostics moved to a separate task