added Today and Week functions