forgot to change some inits along with the actual structs