Before refactoring to include velocity