added hook and fixed 6 items only