tweak to destructuring