TUCKER: Some more renaming
TUCKER: Use a boolean for drawFlag instead of an integer