Major update on everything