unit-veelo rewrite