Change pre-setup to ease deployment