added squamper
fixed merge conflict
some changes I guess