I redid this properly now.