updated cap for assets
Merge branch 'master' into beta