v1.3 - Performance fixes