Final modify for command line shell and fix the problem on skeleton code