added a timeout to the velocity - should turn it into parameter