Basic tailor gem improvement
conflict resolved