Removed the datefmt argument, needs to be squashed