Adding the disabled functionality