Should've happened a long time ago