Improved wavefront loader.