Set up environment (cont.)

cont. last commit