revert refactoring because sort was important
shrinkwrap update, should have been done earlier
consistently use wrapper instead of constructor