Implemented first ring
Resolved conflicts