Prepare for the next version with calc questions