Restructured the sample