TODO comments updated