to continue merging with the branch with further scripting refactorings
add embeddable variant as well