updated to have global disable