Updated everything to the latest syntax