Rich and Vicki update

Added Yigbar and simmonsisfinshed's changes