Added auto op/deop feature