moved logic for orionshoulders issue #2 here so it works for all calls