coding #310 renaming the fields