Added todo to get clarification from vinay and pat