shit-ton of changes