Add timeFrame back into timeframeOrIdent now that timeFrame works