flame size and position
Merge origin/master