added range and fixed dates