Split out sample routines
Sped up 2D sample