Use are.same in a few spots instead of are.equal