AvdP - stumped on crash
otw - Minor changes.