updates for new code