modified for additional fields