effort on bugfix and perfermence improvement.