fixed date and added datetime