Updated sample with new setup