Updated for home drive expansion