Orientation Library + edits