updated with offi