Updates and fixed and preformes upgrades