Added disable, did some refactoring