remove bottleneck to increase performance... again