bug fix + model update