applied PR 675 and 679