Changed Some stuff