Code refactored, cut working for multiple fields