Adjusted the way the extension happens.