massive perf improvment
pre release