added charset and reformatted