Updated and refactored SHELL section