dont fix the problem with the date, but its better