change categories
little modification