Re-structuring command language
same as before