added disabled flag