changed to __modeldef