Altered method name, further small optimisation