added code to calculate disk size
fixed merge conflicts