fix args, speed up