added labels and changed order