Will remove once all the orientation tests pass. Keeping in place for now in case I have to go back