Karl's Update for Req#0003

Karl's Update for Req#0003
Merged two branches

Merged two branches