Adding shell
Adding optimize