2nd update of shell (WiP)