add to cli and messages