#5, #6, #7 issues handled