updated to new syntax