revise for hei with no date bug removed