Octopus shell - Intermediate changes