updated for speeds