Finally finish the performance enhancment