Realized that I broke the previous version, whoops