Throwing more code at the problem initially..