Using connexra format

Merging into master