New opposite sign code, some re-arranging