added 2 more fields