Completed surf changes to fix #7