re-added Orion's changes from yesterday