Reformulated for OpenModelica