updated formating