updates for issue 69 and 23