modified static
Merge branch 'temp'