Reverted Surface.cpp