changed field types, added grace entries