Tons of changes, see discord