Undid more fuckery