Improved speed - v.1.3