Changed style
Merge branch 'scenes'