Forgot to merge StrawData.cpp