simplify and change format to be  standarized.