Made the extension better.