Improved speed - v.1.2