Changed query to avoid conflict
Changed variable organization