@kpedro88, Sure.   Note, that I do not yet include improvements you proposed, because first of all need to see comparison results - in the previous attempt there were too many differences, likely due to change of sim histories.