all dates working ; removed large comments