basic changes to 2.10 (tests still failing)