making changes omg so many changes