Updated for surface build