Updated for new syntax