Fixed performance issue, go to thirty minutes