Improving and converting to an extension