Enhance ass.2: all tests pass