maybe fixed old data issue and stuff being null