Fixed arrays and recreated comments