bug fixed & add new stage