updated not to have to change vars file