#4 and #5 Issues done.