new json and line commands updated
Merge branch 'boss_ginger'