Refactor to still not work