continuation of --python-only functionality