+ Updated regex to account for additional drive ID's