/tool/model.py slight modification