Updating to new syntax