update to new destructuring syntax