Added more momentum stuff