[Shell] Improved.