Working version of the extension