added TODO comments