Changed to pathvariables