Working on Issue #41