added so many things lol