changed some ordering around
more feedback changes