adding back in shotnumber changes and data_contexts