modified fields a little bit