models converted from after dev-5 merge