Updated to new syntax.