Some changes and TODO