update for fixed the TODO