added values and changed order