Removed silly overthinking of speed logic