#2 - Updated Shell