some changed to users table