Correct index handling.
Move the romeo specific part into another file.
Synchronize.