Added loading from launcher