Modified Setup process