Fix speed but still investigating