First Commit
Resolved changes