Fixed velocity conversion...need to be tested!