updated to newer syntax