Update + Sample

The sample is bugy right now, not sure why...