Preparing to merge into main plugin