Changed various