v1.07a - better performance