Moved startup logic to same method