More work on the block device
Better code flow