Updated Shell Logic.