Updated Issues-2 for Review