Some esting changes