Changed some formats