Omg so many changes