updated setup generation