Modified to ignore External/