changed variable organization