working on issue 434 and 435