add two more stage2 entry point