New code for s390x and s390