Added date display, code optimized