added velocity management