adding logic for field checking
solving board-service merge problems