updated for including additional fields