changed order and put requirements