Updated with disable option