Revert "something's up, probably having to do with the orders"

This reverts commit 19d19c8b690bbe26b632a42174b58b200bcb5699.
undo the revert and other changes ... ok i'm tired