Reduce calls
Fixed many calls