Enhancement #9 working

Enhancement #9 will work now. small change has been made to work.