updated for new samples