Shell adapted to new states