Some changes and some new samples