Added functinality for disabled inputs; needs debuggin