some massive changes for both shells