date change
set id method corrected