A little more robust and less dumb