Bunch of improvement and two new samples.