Changed variable order