Move env code part 2