Added surface controller changes.