Changed somethings