Some changes
Adding a TODO