Code now takes Blockstorge into account