changed mkdir order to not disturb setup
merged