SR# 10031
Also changed to a PROC instead of a embeded report