StartUp changes