Made scatter work with current scenegraph branch