need to fix ext vars