syntax updates
Merge branch 'temp'