ISSUE #1. Added some changes