Modify initial setup