Moved drawSurface upward