updated and formated