New optimisation RELEASED and TESTED - about ~3 times faster processing