More changes to use initial data for reliability