re-did Orion's changes from 4 commits ago