+Some small changes