addressed issues cited in 096a0a95