Resolved comments from ~~