Removed the disable button logic, it is broke :-m