add TODO for optimization