Plus Minus Bug Fixed, need testing