begin cross section assignment
fixing merge conflict