added activeField update