Some stuff sort of changed idk