Fixing users
final commits