More adjustments
Merge branch 'test'