Improve ffdemo