Updating branch

Crossroads related edits