todos for S&C update for vaibhav