Implementing new functionality "fields"
fix