adding disk layout and other changes