Added speed related stuff