Changed somethings a bit