Updated velocity implementation. Single thread