Added plus/minus handeling.