This update gets endianness-neutrality right and adds second required