Today
merge from friends_fix