inlined vars
added missing dependencies