add the bootstrap and refactor the top analyzer