Adding in external_storage switching