cli and server amended