both, and am contacting Dell right now about the recalled battery. Hope they are discounting the extra adapter they want everyone to use now, all the time, due to their inflammable battery that we are supposed to remove. Other lapton brands will likely soon have the batt recall as well, it was made by sony