added more new fields (need to update edit)