attempt to incorporate Jaison/my changes
db