Updated to latest syntax