updated for ytd generation