Added Disable and Re-Enable logics!