Update to new layout and add sample.