Getting rid of extensions. Would have been over engineering.