More work on instancing