Speed up
Fix speed and overflow issue