Added show date specs and refactored