Added TODO progress update inside