Add better samples, rectangles