#4 and #5 issues completed