update for Usage and TODO