Now it works, but it's not really what we want!