Added checkbox and enable functionality