changed ordering of types