fix, and add Stage timeline