CLI and GUI now fully compatible