Bug-fix

some new changes