Adapt to devise 2.1