Feature/qc and timing