Implemented date rolling