Major update to everything