modified POG accordinly to the new CLI module