Updated. Separated favorites for future use.