Finilized Setup Changes