updates for ext and testing