Changes to SurfaceManager Class