first commit from office
changes related to categories