Issue #9 Fixed remarks. Part3