Pending changes from previous work.