Made it work, and backwards compat