Clarity TODO Pending changes