switched around fields in models #21