Made it a lot easier to call from an interactive shell