More changes needed to extend max answer code length to 50