Fixed merge from glavin, made it so speed can be set