Improvied 007 command and updated comments