Changed formats a bit