more loc and new fields