update TODO match with changes
add demo