Working on Issue #25,#26