Changed automatic init to manual startup