Yep, that was all included in the calculations XD