commit for tshirtman and qua-non