Added back check for asofdate