correstion 16

move creating the date to serversite, correction of codelayout