Trying to stop it from hanging... may need to revert