Fixed xx references
Merge branch 'xx_references' into design