Updated to un-disable the fields