changed some ordering around