Closed issue #1. Worked on issue 3