Answers for issues #2 and #5