[arctic] - Refactor code.
[arctic] - Resolve confliction.