Adjustment and some bug fixed