Tramps and rings
fixed merge conflicts