fixing sample stuff