ridiculous setup for test case
DRAW WORKSSSSSSSSS
Merge branch 'm-gamma' into s-gamma