added TODO parts