added field limits