create 31 sample and fixes bugs