Embed form converted to two-step form.

File names have become little weird, so any suggestions are most welcome.