Note btw this is no worse than the old solution