removed hidden_fields
refactoring