Changed to sort correctly and not have duplicates and date looks nicer