Redesign the sample/usage