removed leading '_' from fields