few modifs and new date