Made the Shell mode usable.