Retirement tax questions

Thanks VERY much @dmertz for confirming pro-rata and correcting my math!!!

 

As a double-check, regardless of whether the initial $30,000 rollover balance or the subsequent $5,500 non-deductible contribution were in cash positions, invested and earned or lost value, all contributions are considered co-mingled...so, no need to calculate different positions, as the pro-rata formula prevails?