Some changes to samples