[TODO-LIST #005] Yanmin: did some changes in logic end to strong the add-items function.