Tons of changes lol