Changed somethings :)