Revert "Revert "set-up""

This reverts commit bd942f247d42e45f40c31146b87e0899c37bcffe.