Updated to new syntax