Improve samples