Resolved changes