Small method renaming
HY-2 three time speed up in simulation