Updated the shell given @renansaddam pointers