Feature/fix everyone