Slight refactor to speed change