Commit #009

* updated code due to Commit #008