Commented out the +/- swap for now.