Working on optimizing extensions
updated