updated for recent work env