Added date boxes and renamed