Switch to using env