updated and formating