All for the r's and c's
Resolve merge conflict