Added cloth
fixed merge conflict