update to newer syntax
Merge branch 'work'