More refactoring to handle reliability based on initial data not current