update note
update comments
fix pivotal story 49139411