update changes and TODO