figure out the date issue in kptj
merge