Expanding and closing now fix the plus and minus sign accordingly