This should definitely be made permanent.