Fixed + problem & some unnecessary data