Modify so that dwell1 data does not need to be stored