Try to be a little more backwards compatible here