Upgrdes part I