finished modifications for extension usage