added a TODO for multi instance