Initial version, copied from BIER storage and Kadoh