Fixed, refactored and renamed sample. Removed old sample.