Fix/Complete this sample