Fix marking surface version
Add team back in