Fixed performance bottleneck (it was the  calls)