Re-factoring. Changed all 'drive' for 'disk'