This task is a follow-on of http://www.google-melange.com/gci/task/view/google/gci2013/5486014072094720

The objective of this task is to improve the surface area implementation by addressing the issues identified in the comments as well as attempting to improve performance.

Submit a patch that improves the existing implementation.