Reverted back to using Date temporarily