changed variable order