RESOLVE #2, #3, #4, #9 issues.