This commit includes changes made to the last function in the fields category.