I kinda forgot what I did, so just look at the diff for God's Sake