Updated with friendship system